This is the text in SVN.

This is another text.

Changed again!

My changes. 

Now add some more

Conflicts.